Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8346831: Remove the extra closing parenthesis in CTW Makefile #22878

Closed
wants to merge 1 commit into from

Conversation

MaxXSoft
Copy link
Member

@MaxXSoft MaxXSoft commented Dec 25, 2024

JDK-8322982 updated the Makefile in test/hotspot/jtreg/testlibrary/ctw to fix a previous issue with the Class-File API, which was later partially reverted by JDK-8334733 because the Class-File API left preview, but left an extra closing parenthesis in the Makefile, which caused CTW to fail to build.

This patch removes the extra parenthesis in the Makefile.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (2 reviews required, with at least 2 Reviewers)

Issue

  • JDK-8346831: Remove the extra closing parenthesis in CTW Makefile (Bug - P3)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22878/head:pull/22878
$ git checkout pull/22878

Update a local copy of the PR:
$ git checkout pull/22878
$ git pull https://git.openjdk.org/jdk.git pull/22878/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22878

View PR using the GUI difftool:
$ git pr show -t 22878

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22878.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 25, 2024

👋 Welcome back qxing! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Dec 25, 2024

@MaxXSoft This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8346831: Remove the extra closing parenthesis in CTW Makefile

Reviewed-by: liach, kbarrett, lmesnik, jwaters

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 3 new commits pushed to the master branch:

  • b3e6363: 8343224: print/Dialog/PaperSizeError.java fails with MediaSizeName is not A4: A4
  • 60e0730: 8346712: Remove com/sun/net/httpserver/TcpNoDelayNotRequired.java test
  • 807f6f7: 8346847: [s390x] minimal build failure

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@liach, @kimbarrett, @lmesnik, @TheShermanTanker) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 25, 2024
@openjdk
Copy link

openjdk bot commented Dec 25, 2024

@MaxXSoft The following label will be automatically applied to this pull request:

  • hotspot-compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@mlbridge
Copy link

mlbridge bot commented Dec 25, 2024

Webrevs

Copy link
Member

@liach liach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this fix. Let's wait for another build reviewer.

/reviewers 2 reviewer

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 25, 2024
@openjdk
Copy link

openjdk bot commented Dec 25, 2024

@liach
The total number of required reviews for this PR (including the jcheck configuration and the last /reviewers command) is now set to 2 (with at least 2 Reviewers).

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Dec 25, 2024
Copy link

@kimbarrett kimbarrett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 25, 2024
@MaxXSoft
Copy link
Member Author

@liach @kimbarrett @lmesnik Thanks for the review!

It looks like the macOS x64 tier1 gc test timed out, I'm rerunning it. Although this patch has nothing to do with it.

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 25, 2024
@openjdk
Copy link

openjdk bot commented Dec 25, 2024

@MaxXSoft
Your change (at version e33d153) is now ready to be sponsored by a Committer.

Copy link
Contributor

@TheShermanTanker TheShermanTanker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since there is overwhelming approval for this changeset and since it is trivial, I'll help you commit it

@TheShermanTanker
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 29, 2024

Going to push as commit 7995847.
Since your change was applied there have been 3 commits pushed to the master branch:

  • b3e6363: 8343224: print/Dialog/PaperSizeError.java fails with MediaSizeName is not A4: A4
  • 60e0730: 8346712: Remove com/sun/net/httpserver/TcpNoDelayNotRequired.java test
  • 807f6f7: 8346847: [s390x] minimal build failure

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 29, 2024
@openjdk openjdk bot closed this Dec 29, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 29, 2024
@openjdk
Copy link

openjdk bot commented Dec 29, 2024

@TheShermanTanker @MaxXSoft Pushed as commit 7995847.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@MaxXSoft
Copy link
Member Author

@TheShermanTanker Thanks for the sponsor!

Based on the discussion in #22861, this patch should be backported to 24.

/backport :jdk24

@openjdk
Copy link

openjdk bot commented Dec 29, 2024

@MaxXSoft the backport was successfully created on the branch backport-MaxXSoft-79958470-jdk24 in my personal fork of openjdk/jdk. To create a pull request with this backport targeting openjdk/jdk:jdk24, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 79958470 from the openjdk/jdk repository.

The commit being backported was authored by Qizheng Xing on 29 Dec 2024 and was reviewed by Chen Liang, Kim Barrett, Leonid Mesnik and Julian Waters.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk:

$ git fetch https://github.com/openjdk-bots/jdk.git backport-MaxXSoft-79958470-jdk24:backport-MaxXSoft-79958470-jdk24
$ git checkout backport-MaxXSoft-79958470-jdk24
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk.git backport-MaxXSoft-79958470-jdk24

⚠️ @MaxXSoft You are not yet a collaborator in my fork openjdk-bots/jdk. An invite will be sent out and you need to accept it before you can proceed.

@MaxXSoft MaxXSoft deleted the fix-ctw-makefile branch December 29, 2024 11:36
@liach
Copy link
Member

liach commented Dec 30, 2024

@TheShermanTanker Can you verify that ctw now builds?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-compiler [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

5 participants